Apply PREFIX directly to LIBDIR.

Signed-off-by: Bastian Blank <waldi@debian.org>

diff --git a/Makefile b/Makefile
index 696b7dadd6170302c54842ae916b70d6eb815a4a..49fdca4dd2b399836a15a592cb9611f325728e3d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -188,10 +188,10 @@ uninstall:
        rm -rf $(D)/usr/include/xenctrl.h $(D)/usr/include/xenguest.h
        rm -rf $(D)/usr/include/xs_lib.h $(D)/usr/include/xs.h
        rm -rf $(D)/usr/include/xen
-       rm -rf $(D)/usr/$(LIBDIR)/libxenctrl* $(D)/usr/$(LIBDIR)/libxenguest*
-       rm -rf $(D)/usr/$(LIBDIR)/libxenstore*
-       rm -rf $(D)/usr/$(LIBDIR)/python/xen $(D)/usr/$(LIBDIR)/python/grub
-       rm -rf $(D)/usr/$(LIBDIR)/xen/
+       rm -rf $(D)$(LIBDIR)/libxenctrl* $(D)$(LIBDIR)/libxenguest*
+       rm -rf $(D)$(LIBDIR)/libxenstore*
+       rm -rf $(D)$(LIBDIR)/python/xen $(D)$(LIBDIR)/python/grub
+       rm -rf $(D)$(LIBDIR)/xen/
        rm -rf $(D)/usr/lib/xen/
        rm -rf $(D)/usr/local/sbin/setmask $(D)/usr/local/sbin/xen*
        rm -rf $(D)/usr/sbin/xen* $(D)/usr/sbin/netfix $(D)/usr/sbin/xm

diff --git a/config/StdGNU.mk b/config/StdGNU.mk
index d493ba71704a5d7571d60a85d9c6708db4b7671c..0399eb1b4bc75fb4a6f886dbb1d3a4e4ceb61a42 100644 (file)
--- a/config/StdGNU.mk
+++ b/config/StdGNU.mk
@@ -18,8 +18,8 @@ INSTALL_DATA = $(INSTALL) -m0644 -p
 INSTALL_PROG = $(INSTALL) -m0755 -p
 
 PREFIX ?= /usr
-
-LIB64DIR = lib64
+LIBDIR = $(PREFIX)/lib
+LIBDIR_x86_64 = $(PREFIX)/lib64
 
 SOCKET_LIBS =
 CURSES_LIBS = -lncurses

diff --git a/config/SunOS.mk b/config/SunOS.mk
index e84e2777615e04daac17906e14a5b26b652537f2..ce104473fd9cfa3d29bb0bddd4e082e8b2e0cfc8 100644 (file)
--- a/config/SunOS.mk
+++ b/config/SunOS.mk
@@ -19,14 +19,17 @@ INSTALL_DATA = $(INSTALL) -m0644 -p
 INSTALL_PROG = $(INSTALL) -m0755 -p
 
 PREFIX ?= /usr
+LIBDIR = $(PREFIX)/lib
+LIBDIR_x86_64 = $(PREFIX)/lib/amd64
 
-LIB64DIR = lib/amd64
+SunOS_LIBDIR = /usr/sfw/lib
+SunOS_LIBDIR_x86_64 = /usr/sfw/lib/amd64
 
 SOCKET_LIBS = -lsocket
 CURSES_LIBS = -lcurses
 UTIL_LIBS =
 SONAME_LDFLAG = -h
-SHLIB_CFLAGS = -R /usr/sfw/$(LIBDIR) -shared
+SHLIB_CFLAGS = -R $(SunOS_LIBDIR) -shared
 
 ifneq ($(debug),y)
 # Optimisation flags are overridable

diff --git a/config/ia64.mk b/config/ia64.mk
index db40adeb12000658c2b8332657d020d2d6f98838..50edf6313de4974b73d27f40a7781cfb19118939 100644 (file)
--- a/config/ia64.mk
+++ b/config/ia64.mk
@@ -4,5 +4,3 @@ CONFIG_IA64_$(XEN_OS) := y
 CONFIG_IOEMU := y
 CONFIG_XCUTILS := y
 CONFIG_XENCOMM := y
-
-LIBDIR := lib

diff --git a/config/powerpc64.mk b/config/powerpc64.mk
index cba68fec19f220b7e115e5037e43df43eb675eeb..a49efd876b45975cf40fb73681624683f87d74fb 100644 (file)
--- a/config/powerpc64.mk
+++ b/config/powerpc64.mk
@@ -4,4 +4,3 @@ CONFIG_POWERPC_$(XEN_OS) := y
 CONFIG_XENCOMM := y
 
 CFLAGS += -DELFSIZE=64
-LIBDIR := lib

diff --git a/config/x86_32.mk b/config/x86_32.mk
index 9b8cee85b58448d0448b2c5d42b249641961af78..1f5cd6097dae976066914d4f0d26344388e9f7a1 100644 (file)
--- a/config/x86_32.mk
+++ b/config/x86_32.mk
@@ -8,7 +8,6 @@ CONFIG_XCUTILS := y
 CONFIG_IOEMU := y
 
 CFLAGS += -m32 -march=i686
-LIBDIR := lib
 
 # Use only if calling $(LD) directly.
 LDFLAGS_DIRECT_OpenBSD = _obsd

diff --git a/config/x86_64.mk b/config/x86_64.mk
index 288878638c6b281d8002fbb48b2d89435a63b5a9..64291837a4986e0ccc1f0ef83398b012a7ab7701 100644 (file)
--- a/config/x86_64.mk
+++ b/config/x86_64.mk
@@ -9,7 +9,10 @@ CONFIG_XCUTILS := y
 CONFIG_IOEMU := y
 
 CFLAGS += -m64
-LIBDIR = $(LIB64DIR)
+
+LIBDIR = $(LIBDIR_x86_64)
+
+SunOS_LIBDIR = $(SunOS_LIBDIR_x86_64)
 
 # Use only if calling $(LD) directly.
 ifeq ($(XEN_OS),OpenBSD)

diff --git a/tools/blktap/lib/Makefile b/tools/blktap/lib/Makefile
index 2ed818311d1c778ed3fe17600a85df22bfad3469..d06bbf9a9d13df1a0a0982b290f4fb3c3cc9c5e7 100644 (file)
--- a/tools/blktap/lib/Makefile
+++ b/tools/blktap/lib/Makefile
@@ -40,11 +40,11 @@ build: libblktap.a
 libblktap: libblktap.a
 
 install: all
-       $(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)
+       $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
        $(INSTALL_DIR) $(DESTDIR)/usr/include
-       $(INSTALL_DATA) $(LIB) $(DESTDIR)/usr/$(LIBDIR)
-       ln -sf libblktap.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)/libblktap.so.$(MAJOR)
-       ln -sf libblktap.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libblktap.so
+       $(INSTALL_DATA) $(LIB) $(DESTDIR)$(LIBDIR)
+       ln -sf libblktap.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libblktap.so.$(MAJOR)
+       ln -sf libblktap.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libblktap.so
        $(INSTALL_DATA) blktaplib.h $(DESTDIR)/usr/include
 
 clean:

diff --git a/tools/console/Makefile b/tools/console/Makefile
index d612419732f47ad0f298f334fc71ce34f3b41459..22df98291532d8b77aa87d2044b0d8d18fd1625f 100644 (file)
--- a/tools/console/Makefile
+++ b/tools/console/Makefile
@@ -3,7 +3,7 @@ XEN_ROOT=../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 DAEMON_INSTALL_DIR = /usr/sbin
-CLIENT_INSTALL_DIR = /usr/$(LIBDIR)/xen/bin
+CLIENT_INSTALL_DIR = $(LIBDIR)/xen/bin
 
 CFLAGS  += -Werror
 

diff --git a/tools/debugger/xenitp/Makefile b/tools/debugger/xenitp/Makefile
index 21dd7eedb024d0494fccdbfa7272a0e635063fc7..42be8f34c92ec19be80daf8fafdbcbc51f17ac15 100644 (file)
--- a/tools/debugger/xenitp/Makefile
+++ b/tools/debugger/xenitp/Makefile
@@ -27,14 +27,13 @@ build: $(BIN) $(LIBBIN)
 .PHONY: install
 install: build
        [ -d $(DESTDIR)/usr/bin ] || $(INSTALL_DIR) $(DESTDIR)/usr/bin
-       [ -z "$(LIBBIN)" ] || [ -d $(DESTDIR)/usr/$(LIBDIR)/xen/bin ] || \
-               $(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)/xen/bin
+       [ -z "$(LIBBIN)" ] || $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/xen/bin
        [ -d $(DESTDIR)/usr/share/man/man1 ] || \
                $(INSTALL_DIR) $(DESTDIR)/usr/share/man/man1
        [ -d $(DESTDIR)/usr/share/man/man8 ] || \
                $(INSTALL_DIR) $(DESTDIR)/usr/share/man/man8
        $(INSTALL_PROG) $(BIN) $(SCRIPTS) $(DESTDIR)/usr/bin
-       [ -z "$(LIBBIN)" ] || $(INSTALL_PROG) $(LIBBIN) $(DESTDIR)/usr/$(LIBDIR)/xen/bin
+       [ -z "$(LIBBIN)" ] || $(INSTALL_PROG) $(LIBBIN) $(DESTDIR)$(LIBDIR)/xen/bin
        $(INSTALL_DATA) $(MAN1) $(DESTDIR)/usr/share/man/man1
        $(INSTALL_DATA) $(MAN8) $(DESTDIR)/usr/share/man/man8
 

diff --git a/tools/flask/libflask/Makefile b/tools/flask/libflask/Makefile
index a29411f9d52b2fb2953898835c0117b25ca69e2a..719e1f79d1f60bb692547af750b5050555cac3bf 100644 (file)
--- a/tools/flask/libflask/Makefile
+++ b/tools/flask/libflask/Makefile
@@ -33,12 +33,12 @@ build:
 
 .PHONY: install
 install: build
-       [ -d $(DESTDIR)/usr/$(LIBDIR) ] || $(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)
+       $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
        [ -d $(DESTDIR)/usr/include ] || $(INSTALL_DIR) $(DESTDIR)/usr/include
-       $(INSTALL_PROG) libflask.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)
-       $(INSTALL_DATA) libflask.a $(DESTDIR)/usr/$(LIBDIR)
-       ln -sf libflask.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)/libflask.so.$(MAJOR)
-       ln -sf libflask.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libflask.so
+       $(INSTALL_PROG) libflask.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
+       $(INSTALL_DATA) libflask.a $(DESTDIR)$(LIBDIR)
+       ln -sf libflask.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libflask.so.$(MAJOR)
+       ln -sf libflask.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libflask.so
        $(INSTALL_DATA) include/flask.h $(DESTDIR)/usr/include
 
 .PHONY: TAGS

diff --git a/tools/libfsimage/Rules.mk b/tools/libfsimage/Rules.mk
index ca6380a4a13f760aa2ba9e6fd474831a4893b6f9..71d59efae941fc3c3de378f5728b1a39abd0bfe3 100644 (file)
--- a/tools/libfsimage/Rules.mk
+++ b/tools/libfsimage/Rules.mk
@@ -20,8 +20,8 @@ fs-all: $(FSLIB)
 
 .PHONY: fs-install
 fs-install: fs-all
-       $(INSTALL_DIR) $(DESTDIR)/usr/$(FSDIR)
-       $(INSTALL_PROG) $(FSLIB) $(DESTDIR)/usr/$(FSDIR)
+       $(INSTALL_DIR) $(DESTDIR)$(FSDIR)
+       $(INSTALL_PROG) $(FSLIB) $(DESTDIR)$(FSDIR)
 
 $(FSLIB): $(PIC_OBJS)
        $(CC) $(CFLAGS) $(LDFLAGS) $(SHLIB_CFLAGS) -o $@ $^ -lfsimage $(FS_LIBDEPS)

diff --git a/tools/libfsimage/common/Makefile b/tools/libfsimage/common/Makefile
index 5c22fa974d8a0a3cc406e656cb37a8112fbd2dea..ddf1d6a145c127c3e4fdeced9e542f2b7703e030 100644 (file)
--- a/tools/libfsimage/common/Makefile
+++ b/tools/libfsimage/common/Makefile
@@ -22,11 +22,11 @@ all: $(LIB)
 
 .PHONY: install
 install: all
-       [ -d $(DESTDIR)/usr/$(LIBDIR) ] || $(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)
+       $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
        [ -d $(DESTDIR)/usr/include ] || $(INSTALL_DIR) $(DESTDIR)/usr/include
-       $(INSTALL_PROG) libfsimage.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)
-       ln -sf libfsimage.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)/libfsimage.so.$(MAJOR)
-       ln -sf libfsimage.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libfsimage.so
+       $(INSTALL_PROG) libfsimage.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
+       ln -sf libfsimage.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libfsimage.so.$(MAJOR)
+       ln -sf libfsimage.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libfsimage.so
        $(INSTALL_DATA) fsimage.h $(DESTDIR)/usr/include
        $(INSTALL_DATA) fsimage_plugin.h $(DESTDIR)/usr/include
        $(INSTALL_DATA) fsimage_grub.h $(DESTDIR)/usr/include

diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile
index 618b37161575673a395d9d759d87851072b9e297..7d0e9fa846b4b59de01a31fa1c5b93cca910f894 100644 (file)
--- a/tools/libxc/Makefile
+++ b/tools/libxc/Makefile
@@ -103,18 +103,18 @@ check-for-zlib:
 
 .PHONY: install
 install: build
-       [ -d $(DESTDIR)/usr/$(LIBDIR) ] || $(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)
+       $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
        [ -d $(DESTDIR)/usr/include ] || $(INSTALL_DIR) $(DESTDIR)/usr/include
-       $(INSTALL_PROG) libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)
-       $(INSTALL_DATA) libxenctrl.a $(DESTDIR)/usr/$(LIBDIR)
-       ln -sf libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)/libxenctrl.so.$(MAJOR)
-       ln -sf libxenctrl.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libxenctrl.so
+       $(INSTALL_PROG) libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
+       $(INSTALL_DATA) libxenctrl.a $(DESTDIR)$(LIBDIR)
+       ln -sf libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenctrl.so.$(MAJOR)
+       ln -sf libxenctrl.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenctrl.so
        $(INSTALL_DATA) xenctrl.h $(DESTDIR)/usr/include
 
-       $(INSTALL_PROG) libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)
-       $(INSTALL_DATA) libxenguest.a $(DESTDIR)/usr/$(LIBDIR)
-       ln -sf libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)/libxenguest.so.$(MAJOR)
-       ln -sf libxenguest.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libxenguest.so
+       $(INSTALL_PROG) libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
+       $(INSTALL_DATA) libxenguest.a $(DESTDIR)$(LIBDIR)
+       ln -sf libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenguest.so.$(MAJOR)
+       ln -sf libxenguest.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenguest.so
        $(INSTALL_DATA) xenguest.h $(DESTDIR)/usr/include
 
 .PHONY: TAGS

diff --git a/tools/libxen/Makefile b/tools/libxen/Makefile
index 63ba11263de78dd93d583799fe48d36549062f55..8480e3a91714a256673c9407bc70338197d34bb5 100644 (file)
--- a/tools/libxen/Makefile
+++ b/tools/libxen/Makefile
@@ -56,11 +56,11 @@ $(TEST_PROGRAMS): test/%: test/%.o libxenapi.so
 .PHONY: install
 install: all
        $(INSTALL_DIR) $(DESTDIR)/usr/include/xen/api
-       $(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)
-       $(INSTALL_PROG) libxenapi.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)
-       ln -sf libxenapi.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)/libxenapi.so.$(MAJOR)
-       ln -sf libxenapi.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libxenapi.so
-       $(INSTALL_DATA) libxenapi.a $(DESTDIR)/usr/$(LIBDIR)
+       $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
+       $(INSTALL_PROG) libxenapi.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
+       ln -sf libxenapi.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenapi.so.$(MAJOR)
+       ln -sf libxenapi.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenapi.so
+       $(INSTALL_DATA) libxenapi.a $(DESTDIR)$(LIBDIR)
        set -e; for i in $(LIBXENAPI_HDRS); do \
            $(INSTALL_DATA) $$i $(DESTDIR)/usr/include/xen/api; \
        done

diff --git a/tools/libxen/Makefile.dist b/tools/libxen/Makefile.dist
index 0f4a8dbd7552513922f331154af80fae43523f72..6c76433de10635075353191484b01ffa5150b4aa 100644 (file)
--- a/tools/libxen/Makefile.dist
+++ b/tools/libxen/Makefile.dist
@@ -66,11 +66,11 @@ $(TEST_PROGRAMS): test/%: test/%.o libxenapi.so
 .PHONY: install
 install: all
        $(INSTALL_DIR) $(DESTDIR)/usr/include/xen/api
-       $(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)
-       $(INSTALL_PROG) libxenapi.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)
-       ln -sf libxenapi.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)/libxenapi.so.$(MAJOR)
-       ln -sf libxenapi.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libxenapi.so
-       $(INSTALL_DATA) libxenapi.a $(DESTDIR)/usr/$(LIBDIR)
+       $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
+       $(INSTALL_PROG) libxenapi.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
+       ln -sf libxenapi.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenapi.so.$(MAJOR)
+       ln -sf libxenapi.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenapi.so
+       $(INSTALL_DATA) libxenapi.a $(DESTDIR)$(LIBDIR)
        set -e; for i in $(LIBXENAPI_HDRS); do \
            $(INSTALL_DATA) $$i $(DESTDIR)/usr/include/xen/api; \
        done

diff --git a/tools/vnet/libxutil/Makefile b/tools/vnet/libxutil/Makefile
index 3d490f097187f56ffadfafb81e16e870e92266c8..0c8ef6bb73ef09015b7c6c0af62c115f3929d408 100644 (file)
--- a/tools/vnet/libxutil/Makefile
+++ b/tools/vnet/libxutil/Makefile
@@ -71,11 +71,11 @@ check-for-zlib:
 
 .PHONY: install
 install: build
-       [ -d $(DESTDIR)/usr/$(LIBDIR) ] || $(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)
-       $(INSTALL_PROG) libxutil.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)
-       $(INSTALL_DATA) libxutil.a $(DESTDIR)/usr/$(LIBDIR)
-       ln -sf libxutil.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)/libxutil.so.$(MAJOR)
-       ln -sf libxutil.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libxutil.so
+       $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
+       $(INSTALL_PROG) libxutil.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
+       $(INSTALL_DATA) libxutil.a $(DESTDIR)$(LIBDIR)
+       ln -sf libxutil.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxutil.so.$(MAJOR)
+       ln -sf libxutil.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxutil.so
 
 .PHONY: clean
 clean:

diff --git a/tools/xcutils/Makefile b/tools/xcutils/Makefile
index 5fe69eef39c223f54be98e28ea7a97e731970c57..9d70df4fba29f08a25677b380c9c5cd2ad2fa603 100644 (file)
--- a/tools/xcutils/Makefile
+++ b/tools/xcutils/Makefile
@@ -11,7 +11,7 @@
 XEN_ROOT       = ../..
 include $(XEN_ROOT)/tools/Rules.mk
 
-PROGRAMS_INSTALL_DIR = /usr/$(LIBDIR)/xen/bin
+PROGRAMS_INSTALL_DIR = $(LIBDIR)/xen/bin
 
 INCLUDES += -I $(XEN_LIBXC) -I $(XEN_XENSTORE)
 

diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile
index adbe6056752d77de06158d24da84f891cdfc10ed..b1a8d570c42ea29ea62900f8200d7aebff282b8f 100644 (file)
--- a/tools/xenstore/Makefile
+++ b/tools/xenstore/Makefile
@@ -88,11 +88,11 @@ install: all
        $(INSTALL_PROG) $(CLIENTS) $(DESTDIR)/usr/bin
        $(INSTALL_PROG) xenstore-control $(DESTDIR)/usr/bin
        $(INSTALL_PROG) xenstore-ls $(DESTDIR)/usr/bin
-       $(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)
-       $(INSTALL_PROG) libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)
-       ln -sf libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)/libxenstore.so.$(MAJOR)
-       ln -sf libxenstore.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libxenstore.so
-       $(INSTALL_DATA) libxenstore.a $(DESTDIR)/usr/$(LIBDIR)
+       $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
+       $(INSTALL_PROG) libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
+       ln -sf libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenstore.so.$(MAJOR)
+       ln -sf libxenstore.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenstore.so
+       $(INSTALL_DATA) libxenstore.a $(DESTDIR)$(LIBDIR)
        $(INSTALL_DATA) xs.h $(DESTDIR)/usr/include
        $(INSTALL_DATA) xs_lib.h $(DESTDIR)/usr/include
 

diff --git a/tools/xentrace/Makefile b/tools/xentrace/Makefile
index d4917e561e18db3efcc723a9e095ddbebfb570ca..2032405c9e2c236b518c82f3f095a46d0cd6a572 100644 (file)
--- a/tools/xentrace/Makefile
+++ b/tools/xentrace/Makefile
@@ -36,14 +36,13 @@ build: $(BIN) $(LIBBIN)
 .PHONY: install
 install: build
        [ -d $(DESTDIR)/usr/bin ] || $(INSTALL_DIR) $(DESTDIR)/usr/bin
-       [ -z "$(LIBBIN)" ] || [ -d $(DESTDIR)/usr/$(LIBDIR)/xen/bin ] || \
-               $(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)/xen/bin
+       [ -z "$(LIBBIN)" ] || $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/xen/bin
        [ -d $(DESTDIR)/usr/share/man/man1 ] || \
                $(INSTALL_DIR) $(DESTDIR)/usr/share/man/man1
        [ -d $(DESTDIR)/usr/share/man/man8 ] || \
                $(INSTALL_DIR) $(DESTDIR)/usr/share/man/man8
        $(INSTALL_PROG) $(BIN) $(SCRIPTS) $(DESTDIR)/usr/bin
-       [ -z "$(LIBBIN)" ] || $(INSTALL_PROG) $(LIBBIN) $(DESTDIR)/usr/$(LIBDIR)/xen/bin
+       [ -z "$(LIBBIN)" ] || $(INSTALL_PROG) $(LIBBIN) $(DESTDIR)$(LIBDIR)/xen/bin
        $(INSTALL_DATA) $(MAN1) $(DESTDIR)/usr/share/man/man1
        $(INSTALL_DATA) $(MAN8) $(DESTDIR)/usr/share/man/man8